Merge from emacs-24; up to r111341
authorGlenn Morris <rgm@gnu.org>
Sat, 30 Mar 2013 16:55:47 +0000 (09:55 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 30 Mar 2013 16:55:47 +0000 (09:55 -0700)
commitfb62c2aae11e8600c8353cd540c64949334fc07b
tree39cca3e05ca9cca3f9125a6881ed00abfddcaedb
parent1e88f44e01dbaaabccd06ec5f1069e15edce369f
parent03e192550d23d9ed67f3d2f4675d6379b5aff8c0
Merge from emacs-24; up to r111341
etc/srecode/ede-autoconf.srt
lisp/ChangeLog
lisp/iswitchb.el
lisp/net/tramp.el
lisp/profiler.el
lisp/progmodes/python.el
test/ChangeLog
test/automated/python-tests.el